Autogenerated HTML docs for v1.9.1-506-g7bf27
diff --git a/git-pull.html b/git-pull.html index 7095e5c..a898905 100644 --- a/git-pull.html +++ b/git-pull.html
@@ -963,14 +963,13 @@ </dt> <dd> <p> - Produce the working tree and index state as if a real - merge happened (except for the merge information), - but do not actually make a commit or - move the <tt>HEAD</tt>, nor record <tt>$GIT_DIR/MERGE_HEAD</tt> to - cause the next <tt>git commit</tt> command to create a merge - commit. This allows you to create a single commit on - top of the current branch whose effect is the same as - merging another branch (or more in case of an octopus). + Produce the working tree and index state as if a real merge + happened (except for the merge information), but do not actually + make a commit, move the <tt>HEAD</tt>, or record <tt>$GIT_DIR/MERGE_HEAD</tt> + (to cause the next <tt>git commit</tt> command to create a merge + commit). This allows you to create a single commit on top of + the current branch whose effect is the same as merging another + branch (or more in case of an octopus). </p> <div class="paragraph"><p>With --no-squash perform the merge and commit the result. This option can be used to override --squash.</p></div>
